-
Notifications
You must be signed in to change notification settings - Fork 18.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
containerd integration: produce progress events polling ctrd's content.Store #43819
Conversation
Minor fix needed;
|
f99d612
to
da7afb6
Compare
daemon/containerd/service.go
Outdated
return err | ||
} | ||
|
||
unpacked, err := img.IsUnpacked(ctx, containerd.DefaultSnapshotter) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(the snapshotter has to be eventually configurable, in a follow-up PR)
daemon/containerd/service.go
Outdated
_, err = cs.client.Pull(ctx, ref.String(), opts...) | ||
jobs := newJobs() | ||
h := containerdimages.HandlerFunc(func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) { | ||
if desc.MediaType != containerdimages.MediaTypeDockerSchema1Manifest { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we return an error for schema1?
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
da7afb6
to
11e6176
Compare
return err | ||
} | ||
} | ||
stop <- struct{}{} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What's the purpose of this? Seems like this races with your goroutine above.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems like we can close the channel (from the goroutine) rather than sending?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
closing channel would be a valid alternative, indeed
Discussing; we can include rumpl#16 here, but also need to have a look at Lines 198 to 285 in f068067
|
This one can be closed, superseeded by #44756 |
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)